projects
/
project
/
bcm63xx
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
797449a
d510859
)
Merge branch '
[email protected]
' of git://git.denx.de/u-boot-staging
author
Wolfgang Denk
<
[email protected]
>
Thu, 1 Dec 2011 23:05:25 +0000
(
00:05
+0100)
committer
Wolfgang Denk
<
[email protected]
>
Thu, 1 Dec 2011 23:05:25 +0000
(
00:05
+0100)
* '
[email protected]
' of git://git.denx.de/u-boot-staging:
image: Don't detect XIP images as overlapping.
image: Implement IH_TYPE_KERNEL_NOLOAD
Trivial merge